Add inclusion of maps in PresenterWriter methods