Augment data types with generic type parameters