Updated SpamKit