Added typed forms. Added type user field