Update serializer and deserializer contracts; tweak annotations