Add keystone support

@thousandsofthem, could you clarify?