Added support for a dynamic stoplist