Added some more to the core data manager