Added a basic module handling