Revert "Refactor: reduce num data structures in outlet"

This reverts commit 4b1948a1be2d544ac520d86137c75716ab2c97f5.