Add support for implicit joins