Fix creation service and action