Updating Handler classes.

Permissions is not yet done.