Refactor: Use Duration instead of primitive value

Change-Id: Id7de939fd8f1c74cf669207edf16378019b2acc3