Improving StateChart