Added WaitSeconds support