Add new classes for nq files, map files