If I'm honest, I didn't know about Spring factoryBeans. I will take a look at and try to incorporate them (possibly take the opportunity to make a post also). Thanks for the advice.