adding unicorn support