Extend meaning of RECURSIVE
Simplify validation
Fix use of sources hash