Generalize HAP-handlers