BUG-4638: Convert to using new types