Refractored and simplified Contribution serialisation