Add explicit doInitialization/doFinalization methods instead of making