Improved create-service command