Improving core data parser