issue-14: Updatd with removal and deletion of properties and labels

'?' at the end seems to be redundant as a dictionary always returns optional value.