Add layout for h2spatial functions