Created sub documents, and added minimal validation