Added angular variables and expressions