Updated for nimsdata overhaul