Adding last classes

Change-Id: I4305f34a02dfbfea0b5cd4da7cb358e1471c1965