Improve variable handling