Added map
Implemented isEmpty and nonEmpty