CommandMapper and test!
Updated command mapper