Feature/service to action migration