Map & API improvements