Better variable handling