[TASK] Add wrongly removed class

Change-Id: Ib456c361c8ac8b6f985d3475761815b88a9dfd2a