Add some additional contrib modules in