Added two (almost) functional proxy classes