Adding support for time constraints

Change-Id: I843b829f985b41cff6449f4baa8a1e6c2ec6ba38