Changed parsing order for variable types