re-organized proxy related stuffs