Killed mapper layer
New ApiFinder