Updated all files to spec