Update tracking to handle requests from EAC meeting. @huaiyumi please update ticket with requirements
