Added some seemingly missing imports