Added map parser generator