Added proper support for different click procedures