Change of serial number type. Classes moved to packages.