Added future TODO comment (to remove experimental flag)