Changes made for Security Domain related changes