Add requirement and metadata
Improve lat/lon support detection
Add Multiple source support