Added types all over the place in Q