Added rudimentary parsing of entities.