Rich expansion interfaces

Rich expansion interfaces