Further work on allowing to work with custom analyzers.