Working to expose helpers