Update docs, add support for custom messages