Fixed up proxy class