Working on update the engine stucture