Add generique solution for Where condition