Finish String mapping and tests
Add Number mapping
Add Date mapping