Changed map initialization