Fix missing imports
Implemented @mgeiers suggestion