Re-factored full text provider