Use Entity instead of Node