Add Store completion on all functions