Refactor to use context as third argument
Use next without parameters preserve the message