Added WordPressCircuitBreaker
Modified data-sources classes to use short IDs