Add models for main data types