Added Currency and Rank classes