Add Unicorn support