Added more support from machines for components. Now the three basic components should work for all or almost all machines.