Fix info parser. Phase 1