Added some extra modules