Added form factors (bug 978150)