Added some missing import statements