Updated to use strict serialization.