Added more functionality to module system