Add mapping support
Fix namespace error
Add tests and fix the lasts failures