Removed dependency on entity extraction