Updated for nar support