#606: Make module lighter