@@ -33,16 +33,15 @@
 import com.sun.codemodel.JMethod;
 import com.sun.codemodel.JVar;
 
-public class InstanceStateHolder implements HasInstanceState {
+public class InstanceStateHolder extends GeneratedClassHolderDecorator<EComponentHolder> implements HasInstanceState {
 
-	private EComponentHolder holder;
 	private JBlock saveStateMethodBody;
 	private JVar saveStateBundleParam;
 	private JMethod restoreStateMethod;
 	private JVar restoreStateBundleParam;
 
 	public InstanceStateHolder(EComponentHolder holder) {
-		this.holder = holder;
+		super(holder);
 	}
 
 	@Override
 
@@ -31,9 +31,8 @@
 import com.sun.codemodel.JSwitch;
 import com.sun.codemodel.JVar;
 
-public class OnActivityResultHolder {
+public class OnActivityResultHolder extends GeneratedClassHolderDecorator<EComponentHolder> {
 
-	private EComponentHolder holder;
 	private JMethod method;
 	private JBlock afterSuperBlock;
 	private JSwitch zwitch;
@@ -43,7 +42,7 @@ public class OnActivityResultHolder {
 	private Map<Integer, JBlock> caseBlocks = new HashMap<Integer, JBlock>();
 
 	public OnActivityResultHolder(EComponentHolder holder) {
-		this.holder = holder;
+		super(holder);
 	}
 
 	public JMethod getMethod() {