Custom maps heavy improved