Adds support for -e option