Update parsing logic, add jquery