Added nested conversion on props, and nil