Improve settings management and storage