Structure change to Engine