Added class and added method to handler