- Improve Resource mapping
