Added map initialization?