Add support for adding fields to the SELECT clause