Temp - added enable flags and unique id