[UPDATE] Added functions to connect/disconnect focus changes