Updated scheme override