Change Excel from handler to class