Sumit: Maps improvement