Improve extendibility of Enterprise_Search