cool, it should be easy change once we move to restpack-serializer