Minor refactoring for dynamic target values extraction. Documentation fixes.