Adding support for suffix languages