Add support for unicorn web-service