Removed isState field