Added parent and other missing fields