Should we use type key instead?