Minor changes
Link WS to Contacts' events