Feature/move command to service