Refactor Thumbs support