Added encryption to keys, working con configuration