Adding handler class concept