Updated to use Sets for key inputs

Signed-off-by: Jonathan Clerck <j.m.clerck@icloud.com>