Code cleanup in UpdateHandler
PerspectiveSwitchHandler uses now a parameter