Added settings mechanism