Replace flashMessageQueue handling