added more options from modules to wrapper