Added better way to work with maps