Switch to using unicorn