Added class to handler hw2