Updated to support plural words