BaseMapper working
Little clean up work