Updated module selection