Improve settings loading