Moved completion message to session