Better settings handeling