Add start/end annotations and filtering