Refactor the Ata module: