Remove last map from xml, add missing functions