Updated some key feature and made some groundwork for the key
implementation in connectionfragment