Feature/proxy capability

@pablote @radius314