Add sandbox support