Refactored wcm-config