Updated Unicorn tasks