Extend support to timed domain
Add test for timed domain.Change-Id: I7e8a6d1d5c3a54e8e2e6a81d6cd479b769973ade