Subcollection support, fixed required check
0.3.0