Added configurable proxy, cleanup