Feat/angular data