Changed to support a string literal as well as a proc