Added instance
Merged pull request and added proxy classes