Improve module alias support