changed entity definition to work with the newest pull