Slowly moving functionality out of DataMapper class & will delete it