Added map + few adjustments