Added iA Writer and Maps
Bugfix