Updated share functions