Added SelectionController and Click listener architecture