Adding TODO and informations