Add handler types