Added some missing imports