add sandbox support