Added initial Promises support to search context