CARE #21: Forms are now added automatically