Minor improvements
Add ZMAP read support