Updated sandbox patterns for move into templates