Feature/entity percentage