Add nin support