ADDED: Basic data structure for maps and markers