Fixed issues with out of date map type