Updated Handbook parsing code