Started using more CDI for sections and forms