Changing parser to allow configurable windows