Updated form framework