XD-870 Add Modules List support to XD