Added auto encryption to some notification fields
Updated handlers
Quick fixes