enhance reverse engineering

Isn't that what we currently do? I mainly put it there as a temporary solution until we fix it.