Simplified service registration after feedback from Christian Schneider