Core data implementation update