Fix data Source to default the Map

This allows the Mapping to be empty