Polishing users module.