Add Map Support for Api < 11