Handle plural keys. Fix #3