Added settings management