Adapted to single handler registration format