Replace proxy by reify