MT collection refactoring - cms entities