Exported existing types to facilitate testing during development