Refactor serializer out of internals