Added todos for policy