Added decoupled encryption