Adding http-proxy and basic factory support