Core data now works fully with map