Whoops, I forgot to refactor this part. Let me update the PR.