Expanded class hierarchy of Current