Refactored a bit the Engine_helper module (improved abstraction).