Updated engine with COM helpers.