Started work on supporting multiple data sources and mapping to these from publication domains.