Added functionnalities