Add Setting and fix inconsistency