Removed ServiceProxy, added IEasyPeasyFactory