Improved fix for #24: Multiple levels of complex properties (distinct source branch)