Changed model for entity report