added: helpers improvements