Improves parsing