Improve notifications and implement ENC