Updates to remove secruity violations