Added angular validation