Updated mappingsupport files