Feature: Add wait time feature