Added support for localized forms