added handler class & method