Update org, user and server handlers