Added support for -r, -e and -I