Added some core data integration feedback