Fixing transformer for ap and map
- Note: writer still to do!