Completed initial unserialization support