Updates and some improvements on modules funcions