add Unicorn support