Migrate delegate to on
Revert document list to old ways

…as there is no container