Feature/generic action builder