Enhancements to heml data  parsing API