Checkpoint 2 for custom content
Finalize custom content handlers