Unicorn support added