PMO-2800: extensions for debugging and additional mapping