Default to @type instead of @key