Add missing functionality from old repository.