Some changes for unicorn