Change so that we can use type directly