Updated various modules