Changes for Stanford config