Added shared mode support