Revised config code