Add core, special forms sections