[WIP] Remove dependence on Serializer