Removed dependency from use the name of the field hardcoded some times in the language system