changes to hadlers and manager classes.

changes to hadlers and manager classes.