Added logic to add, remove and update property tags