Added basic proxy classes