Changed to use proxy