Added proxies
Added Reference for constants