Added keystone and keystone-db