Updated form factory