Added new entities; Partially done indicator XML parser