Added set and type model