Few modifications to the flowtable generic