Made subdocument values independant of the driver