Work for data model for HA

This commit represents the changes made in order
to support the HA data model.