Added parameters for searching within extra directory