Need to fix this, but adding a TODO comment in the code since this comment might collapse once I push due the addition of ``, optional``