Add flashbag support