First version for DeltaEngine
Merged