Make file now includes more optional modules