Update source specs
Minor refactoring
Fix config/source specs
Target specs