Make map working