Added support for sandboxes