Reverted to not using variadic templates and requiring typedef in handlers