Add structured types for parsing and type checking