Added Vector mapping