[GM] Added a todo