Updated modules from AlignPX