Fix core data?
Remove mapping model again