Adding sandbox support.