Added state monitoring