WIP: use inheritance

Change-Id: I5436cab5c5319f9913714bc67a3c1887c7b935a3