Moved M4 fetching to autogen