Added more to driver serializer