Added keystone file handling