clean up mappinganalyzer and make it easily extendable
add BETWEEN clause and some tests