Finished updating Engine and support to new API