Improve nested property support.