Issue/262 generic actions framework