Moved some helpers into a public scope for contrib