Added angular and underscore