Move callback to completion function