Refactored service registration to work via beans