Added better module-usage