I was going to do this later. But since I didn't find a simple solution for engine->data problems yet (and to be honest I hope the discussion about engine->realease is not finished ;), I am sending these changes to make at least small progress.
Oleg.
