Added support for core data functionality