diff --git a/README.md b/README.md
index d1e3ab8..b37dac0 100644
--- a/README.md
+++ b/README.md
@@ -85,6 +85,9 @@ Rel(web_app, twitter, "Gets tweets from", "HTTPS")
 * Component diagram
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Component.puml`
   * Additional Macros: `Component`, `ComponentDb`
+* Dynamic diagram
+  * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Dynamic.puml`
+  * Additional Macros: `RelIndex`, `increment`, `setIndex`
 * Deployment diagram
   * Import: `!include https://raw.githubusercontent.com/adrianvlupu/C4-PlantUML/latest/C4_Deployment.puml`
   * Additional Macros: `Deployment_Node`
diff --git a/samples/C4CoreDiagrams.md b/samples/C4CoreDiagrams.md
index a0b3771..5f4f88a 100644
--- a/samples/C4CoreDiagrams.md
+++ b/samples/C4CoreDiagrams.md
@@ -32,8 +32,14 @@ Source: [C4_Context Diagram Sample - bigbankplc-landscape.puml](C4_Context%20Dia
 
 ![System Landscape diagram for Internet Banking System](http://www.plantuml.com/plantuml/png/jPPTRzis58Rl_IiEijjuTj8koGh7g9sFhS2o5hE3N2H1S28UIuGbKYFfEkxI_pwIfZGgiZ8KQEahyNoSvxnw8-IzDgZCgiXxUib5YGeBOBJ0LMxcz6GcEKz5GS90GiAGYhBM2iiRpam6XyDXT5_WqnLfZIdD-1U2Wr_YeAB4e4XpWdzwOC_Ca29fDYLTIc6s1OS-eZDaSir52WlCDVM-HbqcIibrw70cSwdWfoD__8thrBwD-t_THJGQFSgLOAWsut55rsJe8Xws1hp0UEkFlvrAnKXrtS_C9YTWg3DY3SeIaoMcRSPEdc-OtoL7IKfBqJ4eTBZqnyTttqujUAeST8WDJzuU7a_RBCFZDzEZoouMQqLI0lE77mDrTE9-RQYJYVjrGUcDDbHyRvQ3WwEJwNcRvStPyUNPy7y5-Z5Gl_hpYa0PPmIw7jRBAIN1GF4qCxtdKsWS-potIV3SUnu5Gun31BOls8V2Qwb3rOvnJf1hx1Esk_lxGDokhNCitXQoPxZ92MRRm1yec4xGqZ6EgLDv8HLCUMf54KieywHNomvxfwUVF0lcFkm-5MShRMH1waxS2PX04Xv1Bi1a18ysRH_Mt6HGXb9_1vWaLd2ZVzw3w6yFTTsXEJScWjiBOKYLYckwtuFuA-4R38CP6Wq-k191fW8F0conyrok_vkimKZup6aDN5Wr2ZHS2a0xnRYTk6fki0ye61Iu92XnKr2rL6rDrBx03WrsRTDDvbTT95uyfd0D2UhCTswx7pMWsT7tebyWhrpW9ymp0Yw2EwvuegIM2mCNJqbcgmWehkYUvf8wjxb2Avp2WdQ9FJDIaGRCyyeZYRse5DeXUIt6VYIvKIWq9YxDFf59NaCDD6tGohmm8_MP9sJXSB7mc7L8Xv1s8VyokAYjtPowoyOFeRuzt7rruEDYqPmxOGKNN1iL910CzAeifJBVIl1e-pz8tzz-iIeUw8zVk17UEPhJQqrwBqhxwyDllyzjCfeguoOOKNidmahR7b75gD-FRH6APYIO3gvoTjunegLLA9tefOQ_LwIT4gxsJWm68ys_qBk3m_7jd78gCodeVZHmb-F1OA_tOhN--SURF-s4rxcgLTogDLHjcqYVTl_NirkB1PwEzEYDGV_wKqTUuBpDE6Caxi_xq8HgXUilQgn2dN0T9RmdmTm_n_y2 "System Landscape diagram for Internet Banking System")
 
+### Dynamic Diagram
+
+Source: [C4_Dynamic Diagram Sample - bigbankplc.puml](C4_Dynamic%20Diagram%20Sample%20-%20bigbankplc.puml)
+
+![Dynamic diagram for Internet Banking System - API Application](http://www.plantuml.com/plantuml/png/nLdXRzks4_tkl-AIdu76lpd9adPj5o1OaxXeCxXfOCSTzacWfRDDb28raegR3VlVTvH4ntBNJRGpEnzQchntzzwxio23RunbskQfQErn6OiymLmBc5cRcRFZOytcHrDkP_auDwXZ9IrAUnIhz7Z0OwOJTSCnGt5yzUBmLZ1fHn_wnoap5ZLjHLSgpPHqYCmLU0Qv96XA6s1d21CbX9fpEGN19GAJ2TIEkJQqKa2bGQYO2V50EJnD-Be0dGvZbU4PN1DHpMBBbJJ09UK6T5kPvWQxODJ4pfb6C0_4DGMbmMbZH4CVKPPRpLEc7mfA9iyofQsZYG8TEtC6FL8j4mDA5bGJpgQQfM1STJW4Ia5_IoLfBqELYLBbIda36WMpc91ObsuPnsMPrATSWL9UWuiFJWD-iJKvdflf-XIBemeSUnDzg7F06IWJeiJoXAECoTCxZ6UIkYuA3LB9G-jtAd5TecjuKefKkItMQk8qFH9Fy1w5oiesewj6vNeFagKyNXZ9fTKgoMCqSC1ogr9cUJ407P1vEaPDpFXIZy-yED_uWywPcvi45cWWV9oNFdEIzgMxYZabK7b4iHB62FWb4ppcv0nEoB6aMo66QAzTd0COBCTLEkVhYTyjXKshi3A_CwYcY_PZZSnK0SwJ0ah__-zV_rgjlKak2oUWJOcYW_Oz4pdresqiPkSddHR0daQRQmdb4NnNdhNsK2OUJ7dQHVdpa-MK2xLjYVEe2709VUpZxceoltmqekr4HrvhHQojH0BdKAPRJbnAgJojGskA2BzI-jcYgSqCt2iRl3GA64sqIhk0aLNkNy76ADoYr0y352in-zNPcO_UxuJaBRvCWGKMk4xhwrBH9Oi_Dz7X0uF5bC0GHHwnYQmRvDFPMEb6qkh1WV8yE4pY0hLvzyAqrX1hzpD8TK3n0EczHd9xQqdiXSdg1KZvksfgBfk9yO71UWWOA8aG6pPer4ZJQ2r1ep0reyqQDCgQISdMqv85YiasR4o_aPh-McBwOLhwcpMcZnFRJ8mF3DP3m419XDYmGOD6cWPh2Hg4gHbirg01dywQTSX7XYloo11L10biKYv_ovN511Rlgvx1GTidQfUPsbM23hIMVpViLt6KrosjgXQ-MBia-8rtsqxzvNKTFhJoWiAOULWWntyYMRxZDNEkZDsAVPvPi8SbQXT6-jUffcRw-EqPwYk6c-gHEvlGO7VheAtEx0O-E_XkpUurDRYtFLDxuKRsmirx0fvgBXlRHx5RTD1L2pUHK3iPmb5J5qVRit0Kxjze5qCuoXgRbstHlMmD-xAT35-_gN_zxTdN3tUllulXSx-v6jj7iLjqq5KBDv5GEnd2GLCN1zkpS13kts07GrZ-g6pidmlUbeUUMxYF3lPVUUakOgtEOvjh_hi-gcxtFd6Sdy6GJ-MrR5bk1SB5xJLSPEwIZHMg3g6ARRNw5xz-7Dr5lrpVlO_wRz-zlUaTT5gjAtzvsHiV568asaicFtCv7HQNe57KOvQDcS4eEi449ozZakJtdBm1Yg8O4-2tOHZFC6NkT6YLHWEvGGqQfznONLBZSg9qMgoxC6DcLbukpb1QppxMcBYFJ9Wki3X6Oq2eANr06n_jTnxPVulxaDO2RzaKbro9ejFdavUlJvyJlJBWq4Ki6-UO_ypksJ3MFBF5zUA5dEQ2QNTogzKzJqWL4yBVnte2C2uPB2QB2MuVm2g8SsDLYjh0FMSEmpNCSGnZhURaJarFTAbocJ3zy2rXrEYQekSdavF9wGz4ZavgIZhmHmjWSRFVDE4GurmJymMGslzz_EEhLwTKmny-fYrQdMad_1APhBbKSsBvRjxGw3e4fmc8PqnEtOUC6JDNEbbqUHtsvPV2sQcL4AY9_8Izc9oyTZJfZDe5ZwTBv3zyke816hjoUY64cfTJR3npeatBUlChMb3oSkJ_RDMVBEjEwbC8pySfjsRvQqK2Yb4VVhmvVdztTpianfxl4tZz5BDsnGJnvERYyTc0oK47t6Wtz3QaNi13qA30sCB_mJtngzcOpr1ZiPOiHJY7dmf_UvTNnFODoYHFnLy0 "Dynamic diagram for Internet Banking System - API Application")
+
 ### Deployment Diagram
 
-Source: [C4_Deployment](C4_Deployment%20Diagram%20Sample%20-%20bigbankplc.puml)
+Source: [C4_Deployment Diagram Sample - bigbankplc.puml](C4_Deployment%20Diagram%20Sample%20-%20bigbankplc.puml)
 
 ![Deployment Diagram for Internet Banking System - Live](https://www.plantuml.com/plantuml/svg/0/xLfhRziu5lqU8F-1utveKoJnevasMoJ1-9KcNSSs_DZCx7HWq19jSqk90adbCTlyzxtKmzRJjfoqG85LW5QMxZqyzv2yV8Y_IOM5SYssl_SQ_K9jWxacSGL32wKS-R5S5lZ-U4xLmfswaWY3suhOwjZWLdb03InCtgN48QpSF3dgCsohyKsdR66fY817aoROOseJSUm4PRWs-5g0WTI2e1bdZDzJUuuOM25icoZscWe9Tnn1sOXn0pFs62MAe8WMSHX_r2v16TeWmkOGtH4XARTHzRXoND5lmzZykDO74-1nneNKTwysNjhZ5vFCT43jJlkctHrDBdlmJxFNwGtGgqllyd67wX42dnS77hMRLrqVTdZzxpQgrlHR-PNQ3XROGc26NQP6v47L6PtRdgG6_4D4tF1UOEUMccg1QfLAz8M57sw8b7XEXlHlWgg_LkAEWXWAstD6q7_tzn1SGy0cN3qwv19gtNUg-Q_a0fj-DSymasH_xod15YiynV8beEf2yFiGnwiszEgzT_cFD63EusKvJpcHdfrDkMkRM3nUN2of9ldayA-aYZ_nBlznWmkJYDmNkfaGK4akY1dGUuqw-96xgd3JOHouTkf_zCQZINqu6VwpFMfUHSETOkFhNEX00pxjThlHQaPD5j1HxmLLa0kG4Yx9Q7awq2ws22erkKKDDCIsH3V3qlwUtmgXwtFztzcCwvQfIpeNnBounS86DJ-UbVMB2zGK12jYWhb09fM6AtLVFaGs8QRKgM5Aq1rcrDHM42InpLMSqHuJX3pgzIUjtcqNN1tFdIl5WJNLjGp8AOTE-t8q6Ln_kXeXHcPUDX9qlb1H5rq93RzfKB93cWXy7z-G2OI2vI4Y4uQdX1r4kbdf_3nuMaAnbeWb2losGDGtkc5c8t-npoIqre-9z7Bnf-_qrrbPlxvOGq07Fo0CQs7aWZh5nG3lIKYxUXWYrs8HBBK_BvKEGfDgzCNI3ttKyIsbArQE8iR2VbQ1N-noELzJ3H-AMYwN4Z80kvdWrY4OyaYJ28YdNnsYqj7HHUbWCyWojhLeo_X3sBXu3KWKRq8Npp_5CUCTe9qT7IL8hi5AKrrdj4AFutS9zDaf5xj8cbHqFLXXQNEKZPQoYyHP2c_0t47gDFVMBXBhZ9pMkVKo0kU0ytjx3TMSCBR4I73S54XIm_4k6exxwI37BwDW9hIpXkHu6_Lo41BinWMrw-oYdHxaqo5sNaQz772OJAoXsjb6mLoC1CTEGGq7ksZepP7ISGvUHiGyT3qLMyDsi8sC-I09ceCjT0mdvkYAC8ViicW4_rN6qDZy84Z2wEZF1ONvhVrNwyXx4NSQRt0QPpaDDZWDifmw6vmweTFAhTyU37lTIUDJk0wkd9xKFZGYQ-NVH-r1jzwPf2pVd-g_bUNmZ-6eVHCng5RVdpPQ6L0fotzuruwBxymbeQvZRaSMXB6rdx-4Icy395U3UHQDn68ieKt6wh7ouLtZ_UMwHInv08esPfCVIpslVZDYEAthltKno4UfYFMZg2UQKGRZTyqFbytALgh_MEfvNM5xrSFDcPz6z1NXdqpp5zdJkRqUNKqwxK_jBYH4ICS4oMMm-tkCp8bj-ZiO-tlVpb7iWjyZC4FVuDLPefjU12R8png-JLwVNXg7DH3pIiXouLdwLPI0pR2Cmwwy82m_kAnDeDUepOZU0zrXEEvxp0jipIpJQjR6J0wQjyT0f27ozcM-sA55RX79GYRj1rM0TdfOoEUV2LqmXlNbHKPxhueB1BBix5dySz0ASiyi8bd8hlflmVz5zTygcDOq8vJbldtX2iY0Yz3FmDsf1bhJd3h88Lwa2dAmYqMngGwUjwtSrXljZg2IJDRiCA_PAYwj4A8Bhw0DxeZfUyStZfemejQlk-r1PAf-ykwqrVhr9QVgHlWryaTD1D9XxJAB-Gbe_t_cyeoPoxUpjE0-yhBcl-i4P_cHFljZaR_zaJsY5FYsWU8DEIknRa5aunYtFQDaBivZby4lP_GAfChC-zz9gNLCDWr5tqEgvmrOox1s7LkM0FxmaZaAsDmaB_7zlk9T6PcnNjD_wU_taZEw-dnVjB-66gtEkqow44c12MOGU5PxsWJwOb-DCpY00EdZ2EaXuOrNeueg5gMBMXJFTGNhym7NUhPY4mK3clrLLwa_rK17g4FlY7PFnkam0rfDWyuz5mG_IudVNjS9JiwK3e96auGnzHRrbCwdu7I47VhsxTilwk5KOusdhgrSL7r_N3b1dT5mYP65WnriB0XurRqRDEAMWLKf-G2T7Z_4SFopBc7o10BQet-Dwex3gE5zYzSWd_4TzivO3M5A1_BS_Akf7_S5luFHLgRrcxcszsqRQaezeZiAtkWpZ9Rbgz6eFqHGnB7kQ2659__sALkaG1zpMgb6rD8_2-l41JQOrgddtK05zmMr82UKLi-gDIDV8qYRvXHiMq5Ur7xXgGKOcyF7Q0YYMrY_7IekG29z20xwm9nA9JnhH6reUfPtVuWMtX4TX5sr0BA1zCWGnDG_8S4S8cmOH4h4-5ntBsNif60jhc1jHmLhKGc71DAwMLJ4si-duZIgtZsP-htrPCVUMdjkTmK6u75BfbjsrnPXL1zfz4v8IWNc1WhEPNhM-d6g9qlgvMm7pmd2gs9oP7lAofKMrpoRhbJS8kArHF20wcDfv8uQn8_QWT_NlI62P5otJS6fkGny5R3l1_OtFW2uQU_VCVHWQiSo4aQCMbIV_vBkL48yV9OTNpnJAOwCWAVqqXRuK14dx8MU6QZ1BISUgNxYwW50awR2u9BF5BgbDamTfERaHsvXepVC7IIc0eo92EgwuV_IY9yurtNJN0WexX3TyByfOnXTKa5cFDvoLY9A1-l-v5ThNrThHkiP6e8wVgkestENOH5Nbx7d2GfD5mLXBLjIs7pqqQEmflqHwGP_XKBrkAGFykh3UvhDVs1nvOyd6a5xUQ4LS_7wa2_9gdjmBp9ZLOqHkg6ZLumt50m8DYNoFcDglVJnHX8M-BdLQ2OyQWLSD7xeuTSHc7dp2h3rfZM_mOBEjTZ_0000 "Deployment Diagram for Internet Banking System - Live")