Add parser and types