added -p and -v mapping