Misssing classes

Change-Id: I1b529dbd32c1423427f9fbab9b10863e54eefbce