Configuration improvments