Move util to shared