Added working pluralization to messages