Add type parameter to all Type models