Module updates

Signed-off-by: Will <sylus1984@gmail.com>