Added some autorequires