Added nested member support