Fixed import errors, added NOTYPE