Added types and expressions