Fixed issues in core data parser