Improvements for new settings method