NTA-54 Update to use the Singleton bean as it needs the lazy access the ...

...value