Updated all files and added additional modules