improved proxy functionality