Updated with 1.6 config elements