Update the AST model classes and visitor

Test Plan: mvn clean test