Changed to shared scheme