Adjusted variable definitions