Added missing imports and files