More work for XS Config