add needed classes

Change-Id: I1d10dae4cc0c03e7de21ef271c4c680562c3a170