added versioning back in. Added proxies to methods