Add logic for contains keyword proposed for draft 5