handler and dao class updates