Re-added ADF; added heightmap primitive