Big changes on CoffeeMachineDTO and Transformer classes