Feature/entity contextual csv