Implemented two more serialisers/deserialisers