Various wiring of services
Update