Add start and end callbacks