Fixed type parameters and documentation