Added recursive checking of properties