Adding purge option and refactor name