Add keystone support

Its my bad, removed unused keystone fields