New Entity model

New entity model