Added HasMap