Added Command-click capabilities