Make the Secret class working again