We refresh the internal codes with the new framework