optimized mapping methods and update readme
Moved to ARC