Fixed service creation