Ok. Lets hold this PR until we discuss the EAP 6.2 Archetypes on next meeting. Thanks @fbricon