Remove bool type, add states.