Reintroduce some of the features lost during the refactor.