Change to use hashvector and externalised ignore list