Why not add just add these changes to xd-module?