Updated Angular functions