Updated label provider (using entity names instaed of IDs for better
readability)