Use vector instead of list across the board