Changed generic forms structure