Upgrade to define Dataitems and persist them to the database.
Added Dataitem/Tag support
Support for Dataitems.