working on MappingDataSource monster