Add some more packages to common
Add ToC support