Implement enhanced Sone provider correctly.