Feature Update - Click-through option