Added the ability to map based on core data entity