Revised to use simpler conf scheme