Add support for unicorn