Better space usage in sandbox