small update in plurals and types
A bit more dynamic and open on the types