Core data manager changes