Added missing variables for options