Add support for FelixClient based input