Improved mapping
Small changes