Refactored Singular/Plural Functionality