Updated to match vector types