Better configuration