Multitenancy action composition refactoring