Add finalization and demand-loading framework