Feature/keystone improvements & Nova Auto-Detection