Added plural and singular logic