Update properties

Change-Id: I4ccaf15acdfaed547afeba02845c305f82a84a0f