Moved to inner proxy class