Added support for sandboxes (/s/*)