Updated engine class