Added state manage system