Added support for delay and force