[FIX] Interface typehint instead of Entity