Add plural name support