[Parser] More updates