Added scheme setting