Some fixed. updatet entity model