Added: todo for upcoming spec changes