Add unicorn support