- First try to add encryption feature