Improved unicorn config