Changed the field 'mass' to 'massValue' in the 'Mass' type in an attempt to make the code a bit more clear.