Adding specs and improves to mapping proceses