Improvements to system mapping guide