Make some hooks optional