Final API review for Wait Message