Added support of Lists and Maps

Also renamed methods because their names had been left when I copied the
deserialization code...