added code to support flagging assets