revamp with ndn-classes