Update to make generic handler