Added support for conditional composition/query/nonquery statement generators