Removing Core Data Stack Dependency