Update MachineEntity with attributes class from Docker
Addresses server pool review comments