Removed whitelist - switch to match option instead of skip