added module handling