Add support for ending_before