Add unicorn-specific support