Add capability to support state as a criteria for vizualisation