Parser refactor, Data parsing ongoing