ID refactor for angular update