Add -b and -e options