Modified parse options