Add initial promise support to Entity