Change type to kind. Really hate that type can't exist in a data map