Add keystone support