Add types classes

Change-Id: I88f56cc6c6d929e0ff842f15ce5146d1653f48c0