Moving to serialized implementation