Added most modules needed