Added the ability to add/ remove from the safelist