Migrate to AC-Vector instead of custom vectors