Finally make modules work properly