CHANGE: Remove new client and will look in TS to fix the FC interface
FIX: Common interface to the FileCatalog