Added angular functionality