Adding TAG handling to sandbox