Reduce the number of classes created

Change-Id: Id97473afc3165c1ff2b16311e63727f1d38cbd93