Added before and finished callback options