Add fluent iface support