Re-add mutualization of code