Update 14 - Subdocument option support