add support for core data