Add initial beni support