Added Vector4 and aligned the mask arrays