Improving sandbox functionality