Fix return value type
Add continue/sleep blocks