Preparing for additional selection operators.

Signed-off-by: Gary Pamparà <gpampara@gmail.com>