Added complete proxy system