Updated form types