Added full text search support