Moved more mapping code from esigate-servlet to esigate-core