Added new handler classes as listeners