First checkin for query plan chooser