Add new variables, use different modules