There's now yet another class for subobjects - SubobjectHandler

Change-Id: I43429b3d59d716666e7b9807d49ec4803cb5161b