Improvements to Keystone class to allow chaining