[IMP] Modules polishing