Added support for Nimblescan