Add mutable map and listbuffer