Supporting Key and Staff changes