Added nested properties support