Updated Settings Class