Add Space mapping and improve comments