service modularise with factory, and search factory on going