Fix currency class - add index to keys