Added finished callback