Adds handling of services