Updated jsp parser for general use cases