Added world class and updated engine