Add final datamodel