Added support for facet api intergration later on