Added endpoint protection