added unicorn support