Add contains and displays support