Added automatic data for empty models