Moved hardcoded strings to a resource file in Common