Add before_first and after_last