Added unicorn support