Added types to expressions