Added initialization of unexported maps