Added support for default messages and simplified request handler