Refactor with `unpack` methods in serializer