Added more state parsing