Replace FLAGS with STATE columns in dispatcher