#987 - Additional refactorings and helper methods for AdvancedCMS support