Added locatization of more fields