MD-Staff: Adjustment to Epic Addres API

CHG0078517 MD-Staff: Adjustment to Epic Addres API