Added better pointer manipulation on modules functions