Added proxy files & reference const vars