FIX: Lazily evaluate serialization class if none provided