Adding clustering defense and ISLR