Add to check KEYSTONE_TYPE