Renamed type to type_ to conform with conventions