Rervert update handler to its original behavior + patch for class parame...

...ter