Modification of client code components model to be closer to the JSON expected structure.