Re-add scheme, add shared scheme