Updated Client Side Vector handling