Add primitive types
Update AST model