Updated Engine class