Fixes, added interfaces for the engine classes