Beginning to prepare for keystone v3.0 changes