Added types to other places.