Add more magic for nsb