Machine Factory Changes to support TOM