Added all required properties in entities.