added entity parser