Last changes on keystone