serialisation logic does not require a wrapper class any more