added new modules and modified genericsetup