Updated/Refactored IAfterMap Map