Add password encryption. Move ConfigGroup marshalling to separate class