Fix parser
Types: Add instances