Really make optional modules optional