Update class scoping