Updated tools to reflect customisations