Added missing imports to fix functionality