Added Click Management