Re-add missing imports for backwards compatibility