diff --git a/.gitignore b/.gitignore
index 8f0dfb2e..a0238a7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ gmon.out
 nonfree
 !target/*
 working_dir
+bender
+morty
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3cee4b02..8d3689b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ init:
     - make idma_nonfree_ci
   artifacts:
       paths:
-        - nonfree
+        - nonfree/ci/ci.yml
 
 idma:
   stage: idma
diff --git a/idma.mk b/idma.mk
index f07240bf..36a6ceb1 100644
--- a/idma.mk
+++ b/idma.mk
@@ -46,12 +46,12 @@ IDMA_RELATIVE_PATH_REGEX := 's/$(IDMA_PATH_ESCAPED)/./'
 # --------------
 # Help
 # --------------
-.PHONY: idma-all idma-help
 
-idma-all:
-	@echo $(IDMA_PATH_ESCAPED)
+.PHONY: idma_all idma_help
 
-idma-help:
+idma_all: idma_help
+
+idma_help:
 	@echo ""
 	@echo "iDMA Makefile"
 	@echo "-------------"
@@ -69,14 +69,15 @@ idma-help:
 	@echo ""
 
 
-## --------------
-## RTL
-## --------------
+# --------------
+# RTL
+# --------------
 
 .PHONY: idma_rtl_clean
 
 # All RTL files
 IDMA_RTL_ALL     :=
+IDMA_PICKLE_ALL  :=
 IDMA_TB_ALL      :=
 IDMA_RTL_DOC_ALL :=
 
@@ -139,9 +140,9 @@ IDMA_TB_ALL  += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_RTL_DIR)/tb_idma_backend_
 IDMA_TB_ALL  += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_VSIM_DIR)/wave/backend_$Y.do)
 
 
-## --------------
-## Register
-## --------------
+# --------------
+# Register
+# --------------
 
 .PHONY: idma_reg_clean
 
@@ -211,6 +212,7 @@ idma_morty_clean:
 
 IDMA_RTL_DOC_ALL += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_DOC_FIG_DIR)/graph/idma_backend_$Y.png)
 IDMA_RTL_DOC_ALL += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_HTML_DIR)/idma_backend_$Y/index.html)
+IDMA_PICKLE_ALL  += $(foreach Y,$(IDMA_BACKEND_IDS),$(IDMA_PICKLE_DIR)/idma_backend_$Y.sv)
 
 
 # --------------
@@ -292,9 +294,9 @@ idma_vcs_clean:
 	rm -f  $(IDMA_VCS_DIR)/logs/*.vcs.log
 
 
-## --------------
-## Verilator
-## --------------
+# --------------
+# Verilator
+# --------------
 
 .PHONY: idma_verilator_clean
 
@@ -328,9 +330,9 @@ idma_spinx_doc_clean:
 	rm -rf $(IDMA_DOC_OUT_DIR)
 
 
-## --------------
-## Job File
-## --------------
+# --------------
+# Job File
+# --------------
 
 .PHONY: idma_jobs idma_jobs_clean
 
@@ -383,32 +385,16 @@ idma_nuke: idma_clean idma_nonfree_clean
 	rm -rf .bender
 
 
-## --------------
-## Phony Targets
-## --------------
-
-.PHONY: idma_rtl_all idma_doc_all idma_sim_all
-
-idma_rtl_all: $(IDMA_RTL_ALL)
+# --------------
+# Phony Targets
+# --------------
 
-idma_sim_all: $(IDMA_VCS_DIR)/compile.sh $(IDMA_VSIM_DIR)/compile.tcl
+.PHONY: idma_doc_all idma_pickle_all idma_rtl_all idma_sim_all
 
 idma_doc_all: idma_spinx_doc
 
+idma_pickle_all: $(IDMA_PICKLE_ALL)
 
-## --------------
-## CI
-## --------------
-
-.PHONY: gen_ci ci_clean
-
-CI_TPL ?= .ci/gitlab-ci.yml.tpl
-
-gen_ci: .gitlab-ci.yml
-
-.gitlab-ci.yml: $(CI_TPL) util/gen_ci.py $(IDMA_JOBS_JSON)
-	$(PYTHON) util/gen_ci.py $(IDMA_JOBS_JSON) $(CI_TPL) > $@
-
-ci_clean:
-	rm -f .gitlab-ci.yml
+idma_rtl_all: $(IDMA_RTL_ALL)
 
+idma_sim_all: $(IDMA_VCS_DIR)/compile.sh $(IDMA_VSIM_DIR)/compile.tcl