Refactored generic handler to support on/once