Refactors, and machine name could be modified