Move currency to superclass