Added imports and removed dupe keys