Fix importing for other modules