Added TODO comment. Awaiting API change. REOL-11