Actually now that we have a proper proxy working; we don't need it to be environment aware.