Fixed issues with core data parser