Adding serialisation support