Parser main class update