More fixes and updates to work towards Content Specs having their own tables and using a Datasource Abstraction layer.