Added additional config elements and facets