Added more variables to the application

Added conditional variables to the application