Added more variables to models