Added comment and map functionality