Moved to common data type structure

Removed concept of 'status'.  Now we have 'state' and 'state_type'