Add ::id key to entity return value