Improve recursive properties handling

Change-Id: I983d89b159143d8ab990f39bc9a1692f80ecbd36