Add support for Keystone