Engine, mapper and hooks tweaks