Improved DSL for waiting