Made changes to core data manager class and related classes