Added some data holders for maps