make the property mapping also time based

Change-Id: I5c7dec27fc6057b28a5b82a0e9d26723fbbbbae0