Updating to support new Nepho features