Adding State paramater support