move more code into service module from beans