Updated with most recent config tags