added shapetype and entitytype