Add copy/paste functionnality
Refator some portion of code