Interface change and time constraints

This commit has interface changes and time constraints
Interface change and time constraints