Made the type parameters a little more consistent