modified parsing logic for open support