add support for language and back compatibility with method find...