Add better messages, support for application/json handling