Two update for modules related functions